bitkeeper revision 1.1170.1.1 (420b98f5HLKkq19C9PxLpNFZOD2-mg)

Make it compile in the non-crash_debug case.

diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c
index 571b76e59bedc9dded569eac85881c0820233b19..de83ae74cbebc217ceb921365401f464b3201626 100644 (file)
--- a/xen/common/keyhandler.c
+++ b/xen/common/keyhandler.c
@@ -149,7 +149,7 @@ extern void perfc_reset(unsigned char key);
 
 void do_debug_key(unsigned char key, struct xen_regs *regs)
 {
-    debugger_trap_fatal(0xf001, regs);
+    (void)debugger_trap_fatal(0xf001, regs);
     asm volatile ("nop"); /* Prevent the compiler doing tail call
                              optimisation, as that confuses xendbg a
                              bit. */

diff --git a/xen/include/asm-x86/debugger.h b/xen/include/asm-x86/debugger.h
index 74e8a82ef50d67012e62505c3b2f2213845b7f19..dc018f5bdb4977025ea519cfbb0031430ed94dd0 100644 (file)
--- a/xen/include/asm-x86/debugger.h
+++ b/xen/include/asm-x86/debugger.h
@@ -123,7 +123,7 @@ static inline int debugger_trap_fatal(
 
 #define debugger_trap_entry(_v, _r) (0)
 #define debugger_trap_fatal(_v, _r) (0)
-#define debugger_trap_immediate() ()
+#define debugger_trap_immediate()
 
 #endif